From 99efc13eb811a6adf976d00ad2b8e16b80d98792 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Wed, 8 Mar 2006 15:35:14 +0100 Subject: [PATCH] Undo misapplied search replace. Signed-off-by: Keir Fraser --- xen/arch/x86/hvm/vioapic.c | 2 +- xen/include/asm-x86/hvm/domain.h | 6 +++--- xen/include/asm-x86/hvm/vioapic.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/vioapic.c b/xen/arch/x86/hvm/vioapic.c index 28a1890085..f3bde8d9ba 100644 --- a/xen/arch/x86/hvm/vioapic.c +++ b/xen/arch/x86/hvm/vioapic.c @@ -52,7 +52,7 @@ static void ioapic_enable(hvm_vioapic_t *s, uint8_t enable) s->flags &= ~IOAPIC_ENABLE_FLAG; } -#ifdef hvm_guest_SAVE_RESTORE +#ifdef HVM_DOMAIN_SAVE_RESTORE void ioapic_save(QEMUFile* f, void* opaque) { printk("no implementation for ioapic_save\n"); diff --git a/xen/include/asm-x86/hvm/domain.h b/xen/include/asm-x86/hvm/domain.h index 23c0342297..812f91d76d 100644 --- a/xen/include/asm-x86/hvm/domain.h +++ b/xen/include/asm-x86/hvm/domain.h @@ -19,8 +19,8 @@ * */ -#ifndef __ASM_X86_hvm_guest_H__ -#define __ASM_X86_hvm_guest_H__ +#ifndef __ASM_X86_HVM_DOMAIN_H__ +#define __ASM_X86_HVM_DOMAIN_H__ #include #include @@ -49,5 +49,5 @@ struct hvm_domain { char pbuf[HVM_PBUF_SIZE]; }; -#endif /* __ASM_X86_hvm_guest_H__ */ +#endif /* __ASM_X86_HVM_DOMAIN_H__ */ diff --git a/xen/include/asm-x86/hvm/vioapic.h b/xen/include/asm-x86/hvm/vioapic.h index ff6d56eb87..6b72f95e5d 100644 --- a/xen/include/asm-x86/hvm/vioapic.h +++ b/xen/include/asm-x86/hvm/vioapic.h @@ -116,7 +116,7 @@ int hvm_vioapic_add_lapic(struct vlapic *vlapic, struct vcpu *v); void ioapic_update_EOI(struct domain *d, int vector); -#ifdef hvm_guest_SAVE_RESTORE +#ifdef HVM_DOMAIN_SAVE_RESTORE void ioapic_save(QEMUFile* f, void* opaque); int ioapic_load(QEMUFile* f, void* opaque, int version_id); #endif -- 2.30.2